From: Joakim Verona <joakim@verona.se>
Date: Wed, 18 Aug 2010 11:11:01 +0000 (+0200)
Subject: merge from trunk, no conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~3573^2~32
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=432c97542003050bab643a8f901feaa326f8369f;p=emacs.git

merge from trunk, no conflicts
---

432c97542003050bab643a8f901feaa326f8369f